Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Dec 2011 08:56:46 +0000 (00:56 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Dec 2011 08:56:46 +0000 (00:56 -0800)
commita4cafc4eea89b0aa44a673d6fcac648f8275db02
treeeca4fec83ae8233203c0da45cd5e094779b3ae19
parent07e28f80feb91ccf65dc3d6e37f08104f9a2ca79
parent6c03efc0ac839647731e11e4afd4d8cbea59154d
Merge from trunk.